Merge version 12+rpi1 and 13 to produce 13+rpi1

diff --cc debian/changelog
index 76dc61d4e63409764ebe29b72627bc33508e70f9,610c3d5ae5732ff98642f87c42deede6f2b82671..855997b6255aef6852d670c04a2b118b64b7a5aa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,17 @@@
- gcc-10-cross (12+rpi1) bullseye-staging; urgency=medium
++gcc-10-cross (13+rpi1) bullseye-staging; urgency=medium
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 04 Oct 2020 20:22:12 +0000
++  [changes brought forward from 11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Sep 2020 23:26:27 +0000]
++  * Build sufficient cross-compilers on armhf to build u-boot.
 +
- gcc-10-cross (11+rpi1) bullseye-staging; urgency=medium
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Dec 2020 16:54:01 +0000
 +
-   * Build sufficient cross-compilers on armhf to build u-boot.
+ gcc-10-cross (13) unstable; urgency=medium
+ 
+   * Build using gcc 10.2.0-19.
+   * Update VCS attributes.
+   * Bump standards version.
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Sep 2020 23:26:27 +0000
+  -- Matthias Klose <doko@debian.org>  Mon, 16 Nov 2020 10:53:03 +0100
  
  gcc-10-cross (12) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge